Fix up broken build targets, and remove everything we don't use.