Removed old Weaver code.