submission cleanup #8