removed unnecessary actions