Fixed comment removal to leave . and ? builtins intact