Clean more things up