Cleanup for local version
Done CRUD