minor cleanups, removing logging