Remove broken legacy code

Change-Id: I825043a3c631b659992a763d28075715d61533c1