cleanup for merge