humm
remove references to name