Small cleanup, removed redundant actions elements
Merge remote-tracking branch 'upstream/master'