remove references to self, clean-up