The way I was handling clearing avatars before was more code than was necessary, this simplifies the process