Remove fpco-specific stuff