remove $default static var and cleanup main class init method