Remove unused class, use delete not free