Cleanup

Clean up stuff from HHVM and PHPUnit