Personal preference: These file removals would've been good to do in a separate pull request because then it doesn't look as terrifying when looking at the diff stats for review. But since we're already here, just leave em in!