cleanup for merge request