Sprint 9
Corrected disable customer tidy up issue