Remove dead code

Change-Id: I40797639d92749ec49210ae0a7aaf030ade9eeb2