remove old unnecessary code