cleaning and aligning customer, site and user controllers and models