Further cleanup.