Remove unused classes & variable.
Merge pull request #366 from DFurnes/cleanup

Remove unused classes & variable.