Remove the debugging stuff, it does now work, just cache issues