Remove code to be gone