ADEN-580 Clean up after the GPT rollout
Merge pull request #1672 from Wikia/aden-580-clean-up-gpt

ADEN-580 Clean up after the GPT rollout