Made the cleanup command for orphans working again. We still need a solution to clear empty directories.