Remove "main" namespace options
Merge branch 'fixMainNs'