Checkpoint for delete listener and tests
Checkpoint before refactor
Working meta data cleanup
Passing tests for meta data cleanup.