remove some unused code
add username to users