Removed references to the core-db, as well as unused imports