Additional efficiency cleanup