clean class 2 code
cleanup class 3 code