Fix comma
Cont'd FPPickerController cleanup