commit before merge
cleanup controller