MOB-1128 Removed commented code