Removed comments and default config elements