Small updates to remove some junk