[8] Further cleanups