removed classes
Merge branch 'master' into Nicole