remove pointless * 1 from calc