Switched to comment-removing parser instead of explicit check

Restored newlines between imports

Switched to comment-removing parser instead of explicit check