cleanup for branch merge