Cleanup in progress
Batch update refactoring in progress