Bit of extra cleanup