Removing old abstraction layers.