cleanups and remove tracing messages