Cleaned references to contextID when it's useless
Merge pull request #1 from beaufortfrancois/cleanedContextID

Cleaned references to contextID when it's useless