remove unused code, reduce chatter in server.log