Cleaned up a lot of more debug statements