change class names throughout, add remove statement at case 2