change username; remove simple push