Merge "Remove adittional type hinting stuff because PHP will die if its there >_>"