Removed Debugging Code
Various Changes - Unknown

I’m having a lot of problems syncing my last few commits. This is an
attempt to get these pushed.