remove factory class, upgrade ult class