Remove (now) out of context comments, as suggested by mwiencek