Cleanup controllers #43