Clean up

I removed debug functions I created and were non-functional. I also
simplified some of the logic.