Fixed removal of folders