removing obsolete files and unused variables