Remove errored calls

Change-Id: I3239c84bacc1e9300414f5f40feeedbbb0edcecb