Cleaned up some deprecated comments