Clean the obsolete lines of code