cleanup
Merge branch 'beta' into beta-ics
removed commented code
Merge branch 'beta' into beta-ics