Purge Data Controls

Purge data controls were added into the build in 18 and removed again in 36.