Fixed obsolete comments logic