Remove thread unsafe