removed unnecessary codes