Cleaning up low level stuff - another part.