'this' cleanup