removed obsolete lines of code