Fixed watch bug and removed addons on deploy