Remove Site ID dependencies from site API