Clean up code (minor refactorings, removal of unused code, etc.)

Clean up code (minor refactorings, removal of unused code, etc.) #115