Remove GridPP files and merge HLT config changes