cleanup PR 70