Remove unused modules and variables.
Merge pull request #2126 from AnalyticalGraphicsInc/cleanup

Remove unused modules and variables.