Removed outdated imports