Removed imports that no longer work after upgrade