Remove deprecated classes/methods