(MESS) gmaster : cleanup