Updates to cleanup code.