Check before sourcing, no longer need to remove