chore: Fixes some non-breaking code, and removes an unused file.