Clean up and fix FC