clean up
Some more clean up.
some config changes
such changes