Finished chopping the per-user stuff out.