Incremental Update

More cleaning up.  Removing excess code.