Removed functionality-borking comments