Removed some unnecessary locks. Cleanup.