Clean up code by removing unnecessary return types

- Fix test
- Comment out dead code