Bit more clean up after major