remove thread as it was causing race condition issues