Cleanup
Getting rid of state in favour of TVars
Cleanup