Final performance improvements, cleanups