Removed most redundant actions