Remove obsolete or never used, reduce commenting