Removed dependency on norma-watch