rm classes, update main class