removing commented out code
self/this, etc.