Remove code that should not be there