chore: miscellaneous cleanup