Remove obsolete code

Change-Id: I678e7a1711cee3c13c34019548beec4ab6cbd1ca