Logging and watches fixes
Remove unused import
Get rid of StandardPolicy and PolicyCollection