[#715] Further cleanups