final cleanups