added auto-removing comments