Cleanup obsolete comments