Forgot to remove some now unused variables
Merge branch 'PHP-5.5'