[enh] Watch changes
start removing promises
remove promises