Fixed commented cleanup