rm unnecessary code