Removal of annotated CommandResult resolution mechanism

Change-Id: I4e12bf1c00771ba181501c774a9c0b15ac90b500