Remove references to Fabricate