Remove unnecessary reference to self
Cleanup on Client