Remove single-user assumptions