Remove code all again