Big commit: removing "vestigial" (Query/Combo) version of site