Some fixes removing sites and comments

Comments haven't been assigned to someone yet, and even if it was, half changes suck. Reverted. Also fixed up contrib.sites framework problems.