finally allowing rx syntax + updated tests
removed dead code