Removing Semaphore usage