Clean up some default decision points