diff --git a/TODO.md b/TODO.md
index a16c10db..fb6c1437 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,6 @@
-- Use childrenRect stuff
 - If avatar is set, name color from average color?
 - banner button repair
 - Wrong avatar for group rooms
-- Make sure to not cache user images and that sourceSize is set everywhere
 - Reduce messages ListView cacheBuffer height once http thumbnails
   downloading is implemented 
 - HTextField focus effect
@@ -16,8 +14,7 @@
   no last event room text is displayed
 
 - Qt 5.12
-  - New input handlers
-  - ECMAScript 7
+  - See about ECMAScript 6 and 7 features
   - .mjs modules
 
 - Refactoring
diff --git a/src/qml/Chat/RoomSidePane/MemberDelegate.qml b/src/qml/Chat/RoomSidePane/MemberDelegate.qml
index 37488839..41ec882f 100644
--- a/src/qml/Chat/RoomSidePane/MemberDelegate.qml
+++ b/src/qml/Chat/RoomSidePane/MemberDelegate.qml
@@ -29,8 +29,6 @@ HHighlightRectangle {
 
             HColumnLayout {
                 Layout.fillWidth: true
-                Layout.maximumWidth:
-                    parent.width - parent.totalSpacing - avatar.width
 
                 HLabel {
                     id: memberName
diff --git a/src/qml/SidePane/RoomDelegate.qml b/src/qml/SidePane/RoomDelegate.qml
index 3fa7214c..378ccfb9 100644
--- a/src/qml/SidePane/RoomDelegate.qml
+++ b/src/qml/SidePane/RoomDelegate.qml
@@ -34,8 +34,6 @@ HHighlightRectangle {
 
             HColumnLayout {
                 Layout.fillWidth: true
-                Layout.maximumWidth:
-                    parent.width - parent.totalSpacing - roomAvatar.width
 
                 HLabel {
                     id: roomLabel