Cleaned up alamofire stuff, and took out bad enums