removing some dead functionality