cleaning up a few more things