Remove deprecated AbstractData