Remove deprecated class calls