some clean up

left the guestnet routines in there since they may be used for different
sites later.