Clean up user table (bug 1058988)