I left them in until we can figure out how to fix them (i.e. this PR is incomplete)