More complete cleanup (for servers in particular)