Remove code warnings