Cleanup

For Jeremy.