UserHelper.m clean up includes