remove ||= client methods, and instance variables that we will not need
remove instance variables
fixed conflicts