delete more code
oops, changed semantics