username changed & clean up