clean up stuff with avatars and images