remove some debug spew
clean up a few issues with underwater validation type