clean up code from listclass migration