Code cleanup

* Remove outdated or already addressed TODOs and FIXMEs

Change-Id: I9f7f3806a6becb7f63066e2c86ac8739899b7308