Simplify slave and comment