Remove class usage