remove "self" dancing everywhere