Cleanup and stability improvments

- Cleaned up some unused code
- removed call to function that was allocating a buffer locally which seems to have been the cause for the watch unstability
- removed vibe on connection error (status message still updated)