Some final cleanups