removed further outdated stuff