closes #24: removing unnecessary locking