removing dup code
Merge branch 'master' into grp10no90