[aerogear-dev] iOS branch cleanups