Remove deprecated annotations