For changes above, Removed unnecessary code.