playbook cleanup for issue #888
more playbook optimizations for issue #888