Removing a few references to action