removed lots of outdated stuff