delete obsolete and duplicate code and missing ,