removed a lot of unnecessary actions