cleaned unnecessary actions