Synch with same class on wlox-api.
Removed unecessary code.
Merge pull request #10 from wlox/master

Keeping classes in synch with api repo.