CON-732 | Remove comments