Removing hhvp and 5.2