Progress on cleanup and collapse methods.