Cleanup

* Remove redundant assignments
* Remove unused return values
* Remove unused method parameters
* Remove empty methods