remove numeric optimizations and move to BooleanSimplification
minor comment improvements