using tags and cleanup

Extending playbooks to use tags