Clean up some stale code and comments

Change-Id: I535413ed85a6d0254bba2e6324cb624cc49865b2