Remove hhvm for the moment
Small refactor