Clean up unneeded debugging models
Now use an InterleavedBuffer for the draw commands as well