GDA-6001 remove unused class