rm unnecessary logic class