Removed some unused modules
Merge branch 'master' into d3test