Bit more clean up work