Remove code that clears the database on every run
Fix save event