class usage cleanup