MOB-645 - Removed extra optimize step.