Clean up and prepare a bit for custom default avatars