Clean up more current-state code