Remove no longer used logic from generalized setup mechanism.