Commented out a few lines