cosmetic fixes
remove User!