Last of the clean up