finished cleaning up ExpressionBuilder