Refactored: removed obsolete code
Refactored: finish-ing of jobs and rivers.
Removed: redundant code.