rm cruft
formatting
copy condition types from sandbox.web in attic