Clean up obsolete/redundant stuff

Change-Id: I7ae8921d8d72e6a7cd772242ef5353f873d56a53