Removed dead code

Change-Id: Iad8cc7a59389e2816088d542a7ca53a4b8cec72e