More site manager removal.
Merge pull request #262 from wshafer/master

More site manager removal.