Cleanup of old code in the DefaultController