cleanup.  removing special callback interfaces