Cleaned up new user functionality
cleaned up workspace.xml cnflict