Remove Z5 support