removed river-related support code