Some cleaning up in prep for tests [skip ci]