Cleanup imports for functionality that has been changed or removed