More flags update

/cc @wheresrhys 

Carrying on your flag work and removing next-actions-component