Partial port to WebBlocks semantics and remove redundant classes