CRUD cleanup