Remove implementation details