Cleaning up some code to take advantage of the new CommandButton omitting functionality.