remove unrealted, change class name