Even more clean up.