rm re-definitions

Change-Id: I4f204251ad992798cf7a7046b4e447cc86825ae5
Signed-off-by: cj360 <ayunker551@gmail.com>