Removed some plots, some minor cleanup.
Some more cleanup