Remove logging
Add watchenter