removing some outdated code