Cleanup of Controller