removed unused threading locks
Minor re-org