Remove implementation dependent check