Removed plotting crap, little housekeeping.