Removing extra folders