Cleanup of controller file