More simple cleanup.