Remove duplicate check
Use shell includes

Better than defining everything locally.