remove comment/legacy code