removed/moved comments