remove useless part of error message

also did a bit of code cleanup for consistency

Change-Id: I48832c36e1a8b5a0029598dc74aaeaa3b3d2a66f
Merge "remove useless part of error message"