Oodles of cleanup, actually use user locks everywhere