Fix DataMapper and Data for hhvm
Remove other version