Minor fixes, some deletions.