Delete watchers and other unused code

Change-Id: Ie4a365ace7c77499bcede7e3d232d9a3816e42ab
diff --git a/VERSION b/VERSION
index 7d2ed7c..cd57a8b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.4
+2.1.5