get rid of 'site' as optional arg, was only useful for testing.