Remove use of this in handlers