A bit of initial cleanup
We sure are slow