Removed obsolete comments, cleanup (cosmetic and other)