refactoring. does not work
refactoring... does not work, removed alamofire
Fixed conflicts