am 4fe49766: Merge "Delete some pointless and invalid code."

* commit '4fe497660c2e939300dc5b743d662aef458b1726':
  Delete some pointless and invalid code.