Cleanup for merge