Remove Witness dependent stuff