Remove unused code

Change-Id: I53934a327a86f8654f53308e46fbe183a69eb7c3