Implemented pull request comments: removed unused code (yay!)