Remove code copying