Tidy up gmp cleaning