removed user control and rolled back