Fixes to main

Corrupt project file due to merge logic in GitHub.  Removed the
offending tags.