Removed UIKit references and updated some missing files during merge.