userimport more code cleanup