remove unneded code