removing --list
removing unused actions
adding TODOs