removed unnecessary pieces of code