Clean up in 'samba' role, tags moved outside