removing unused parameter and field
EP for upsource
EA-55461