removed some outdated code