cleanup for merging