Removed fossil prep_dump step from code, and other minor cleanups