some last cleanups