Cleaning up the Action Viewer