cleaning up of the vitalae branch for a merge