removed machine specific info
Add stash drop and clear
fixed username