Remove avatars and fix for Textual 5