Let's get rid of all the useless "self" in this file  - I think there are more down there.