Removed outdated definitions