CustomerController cleanup