add username and remove twitter