playbook cleanup for issue #888