Adds bits of cleanup.