Remove code which make warnings