Finish merging iPhone and iPad sync view controller and cleaning up