Make the clear method more efficient (missing some extra parameters to clear)
Reworking the unit test error to remove a binding which was not cleared, making many things failing...