Clean up Context_Wrapper from old stuff