remove extra files
fix userName