crespo: Cleanup