Remove vestigial abstraction