removed obsolete code/commented code