Remove unbound variable warnings

Remove unbound variable warnings that were resolved at runtime
I agree, you seem to be using a List as a set. Any reason for this?