Continued cleanup.