Cleanup some redundant playbooks