Cleaned up a bit mean removal for GAMP (should it be working better?)