Cleanup, #20.