Removing Persistor classes. Cleaning imports.