Almost final cleanups