clean up and class 7 submission