Removes dead and unneeded code

Change-Id: I8ddda74fde50e5f6aabb6aa28313bc189b518de4