playbook cleaned up

Change-Id: I9a084b9b74cbedd06d7da96b830bdf5e28f4b4a5