Tests are all working.
Removed unused lines of code and comments