Clean up for merge