Removed the remaining weave mode code