Cleanup, less chatter