Remove depracated attributes