removed unnecessary keypath prefixing