remove swamp validation type
more cleanup work.  ground and submerged should be ready for testing