Removing adapter code, since this logic gives errors.