CRUD cleanup and consolidation.