remove commented-code
remove calls to error_log in upgrade code