Can we remove this controller as part of this work or are you preferring to do that with your V1 controller cleanup?