Refactored commands and removed contextMenuActions