Some simple clean up.