remove watch tests
remove log
cleanup