Remove implementation and code