Removed cross-thread function calls