Removed outdated parts