Fixed #31 - Removed unused code from the project