Clean up after dave's clean up