Cleanup overkill on comments