Bit more cleanup
Tweak to use new build scheme