rm ordered class
added remove modules