Bug 1018819 - Move TAG_OPTIONS to separate file
[GAIA BUG1018819] - commenting unneeded files