Ch 11 cleanup

What about all the userid's and the site specific stuff?