Breaking changes

* Removed commented out code
* Changed the error names
* Fixed a build error