cleaning up helpers and controllers