Remove manual initialization