Revert "Adding a watchpoint manager to handle storing watch points." to do these changes in feature branch

This reverts commit 8e674dd5b433b2d3f7ec2dcd6906992303d99f7d.