Bit more cleanup