Remove some outdated comments
Small cleanups
Test against php56