Remove code that is not needed any more