Cleaned up some Debug code