Removed some deprecated comments
Merge branch 'linnea'