Remove Unused Class