remove obsolete code

Change-Id: I9c094e84cbe9b83f31c5863bda0af8721d09e2ea