removed useless watches
Merge bunker/main