Remove locks from count for now