Fix schema update scripts

* Removed unnecessary update scripts and fixed the erroneous
ones. The change from the channel_filter_* tables to river_channels
requires some data migration
Coding style update
Merge branch 'schema-update-cleanup'