Remove class usage - clean up #1
Remove class usage - clean up #2