Major iOS cleanup