clean up some self. variables