remove package folders and small cleanup