Added timeout removal. Needs testing.