some cleanup, things we didn't need to do in previous commit
tests for previous commit