Cleaned up

Removed the unneeded address watch mechanism. State manager's transient
state should now take care of this.