Cleanup and refined user checks.