Fix scripts path in watch tasks & remove commented lines and unused modules