Fix invalid self
Cleanup global namespace pollution.