Remove some old code

Change-Id: I310e4acb1fba6fa42baaaafaf3e39a52c001aea4