Clean Up

More clean up.