a little refactoring to make deleting nice, and to make consistent use o...

...f user_site_list()