small FOP cleanup