removed unused code elements
Merge branch 'notes'