Add initial attempts to automatically clean up dangling hosts

Add initial attempts to automatically clean up dangling hosts #820