Add comment
Remove solution verification routine
Some cleanup