add iOS & commented out unused code
Merge commit '8eeb97577bd39dea23238ea150bb8bb08e697fc2'