Removed outdated stuff