Add some cleanup code to gumcontroller