Remove unused weave code