Cleanup

- removes some leftovers
- fixes a typo