Removing dead code / legacy comments...