small cosmetic fixes
removed obsolete code