Some more final cleanups