Synch with same class on wlox-api.
Removed unecessary code.