Cleaned up debug statements