remove newlines around macros
remove upgrade nagging