Fix collisions between multisite and single sites.
Remove debugging info.
Tag 1.0