User Maintenance get rid of excess code