Remove unneeded/blocking minwaterdepth, and fix/cleanup armeyes/coreyes