cleanup cloner / new API for visitor