remove some unused class
add new modular for orc