clean up, needed for new version