Cleaning for proper plugin-ize and database.