Cleanup of outdated comments and debug stuff.

Change-Id: Idb7ab00bd091fea17d43b9334e6f768030acd8bd