remove un needed fuctionality integrate new flags