MOB-163Removed commented code