changed removing of directories.
Always remove them.