Addressed comments on pull request.
Removed unused functions
Removed unused field