Remove generic cast