Fixed issue #39
Removed not-used classes