Remove 1.4 code weaving