Clean some things up