deleted strange content
Merge branch 'osc' into development