CRUD clean-up