Bit more cleanup.