unused method
code simplification
Merge branch 'master' into ice-cream-sandwich
yota branch has gone
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
removed unused code
imports cleanup + formatting