remove references to Top