Semaphore implementation seems unnecessary, removing it