Remove data injections
Review comments
Review comments, return val from acking function
Similar for fail