Removal of AFNetworking dependency