Additional work on User dialog
Some removal of old files