cleaning up for merge