Removed dead code

Change-Id: Icc71dc48efe90d248258638bdeff36cac7cd0ad4