More code removal

Only one function left to reimplement. It's so large, though, I will
not be surprised if it ends up being multiple methods.