Remove global class instance

This is much easier to evaluate. The less variables you need to
keep track off, the better.