Fixing clean index orphans

This should resolve #1