cleanup and references to please @ericf