Clean up of unused custom class