Small fixes
Remove some unused code
Merge pull request #94 from gorlanwix/Feature-MinorFixes

Small fixes