Remove all this code