removed obsolete code
refactoring
remove unnecessary code