Some simple cleanup.