Remove comment overkill