_watch method refactored
dependencies cleared