Removed partitioning for calculator operator #99