Remove more gmcs references