Removed orphan files due to removal of underscores
-fixed pedantic error messages
-added cat-workarounds for OM
-all examples check OK in OM
-only pure water examples run