removed unused classes - closes #78