removed some old outdated functionality