Fixed threading issue

removed unneccecary overhead