Remove old debugging layer stuff; it doesn't work and we don't need it right now.
Merge conflicts; Remove old debug layer crap.