Removed old, outdated stuff