Clean up classes that manage inserting and relayout