Updated RestKit support and removed as much old code as possible