Removed thread unsafe methods