Cleanup
Cleanup
Refactoring
Fix media index cleaner
Improve test coverage
Remove debug logs