Delete obsolete files & minor fixes