Removed Unused classes and commented out code issue #13