Removed unnecessary codes