Removing old references to `self` and replace with `.bind(this)` where this reference is needed to be passed to inner lexical scope