Fixed deleting of files in the universe dir and also support removing cluster dirs.

Fixes 25