Fix some clang errors. Also remove a reference to a deleted file in the scaffolding.