deleted a few commented out lines