Delete unused class
Fix class heierarchy