Clean-up patches