Cleaned up stuff.
more cleanup