ADEN-580 Clean up after the GPT rollout