CON-1077: Removed commented code