Remove dup calc