Removed unneeded code

Change-Id: I94bc1a9e735006b7cd54bb84a3de0776ea5b30e7