General clean up for stand up.