Remove unnecessary user handling