remaining clean-up and build fix.