Removing unused functionality
Merge branch 'master' of https://github.com/SDO-Net-Stream/EducationalTesting