Fix build breakage from removed code, and add gitignore