Clean up various leftovers to fix the build