General cleanup.