diff --git a/messagix/events.go b/messagix/events.go
index dbeb300..613a575 100644
--- a/messagix/events.go
+++ b/messagix/events.go
@@ -199,23 +199,18 @@ type Event_Ready struct {
 	ConnectionCode ConnectionCode
 	CurrentUser    types.UserInfo `skip:"1"`
 	Table          *table.LSTable
-	//Threads []table.LSDeleteThenInsertThread `skip:"1"`
-	//Messages []table.LSUpsertMessage `skip:"1"`
-	//Contacts []table.LSVerifyContactRowExists `skip:"1"`
 }
 
 func (pb *Event_Ready) SetIdentifier(identifier uint16) {}
 
 func (e *Event_Ready) Finish() ResponseData {
+	// TODO this should not be in the ready event
 	if e.client.platform == types.Facebook {
 		e.CurrentUser = &e.client.configs.browserConfigTable.CurrentUserInitialData
 	} else {
 		e.CurrentUser = &e.client.configs.browserConfigTable.PolarisViewer
 	}
 	e.Table = e.client.configs.accountConfigTable
-	//e.Threads = e.client.configs.accountConfigTable.LSDeleteThenInsertThread
-	//e.Messages = e.client.configs.accountConfigTable.LSUpsertMessage
-	//e.Contacts = e.client.configs.accountConfigTable.LSVerifyContactRowExists
 	return e
 }
 
diff --git a/messagix/threads.go b/messagix/threads.go
index 0e4889c..463197b 100644
--- a/messagix/threads.go
+++ b/messagix/threads.go
@@ -7,32 +7,6 @@ import (
 	"go.mau.fi/mautrix-meta/messagix/table"
 )
 
-type Threads struct {
-	client *Client
-}
-
-func (t *Threads) FetchMessages(ThreadId int64, ReferenceTimestampMs int64, ReferenceMessageId string, Cursor string) (*table.LSTable, error) {
-	tskm := t.client.NewTaskManager()
-	tskm.AddNewTask(&socket.FetchMessagesTask{ThreadKey: ThreadId, Direction: 0, ReferenceTimestampMs: ReferenceTimestampMs, ReferenceMessageId: ReferenceMessageId, SyncGroup: 1, Cursor: Cursor})
-
-	payload, err := tskm.FinalizePayload()
-	if err != nil {
-		return nil, fmt.Errorf("failed to finalize payload: %v", err)
-	}
-
-	packetId, err := t.client.socket.makeLSRequest(payload, 3)
-	if err != nil {
-		return nil, fmt.Errorf("failed to send request: %v", err)
-	}
-
-	resp := t.client.socket.responseHandler.waitForPubResponseDetails(packetId)
-	if resp == nil {
-		return nil, fmt.Errorf("failed to receive response from socket while trying to fetch messages. (packetId=%d, thread_key=%d, cursor=%s, reference_message_id=%s, reference_timestamp_ms=%d)", packetId, ThreadId, Cursor, ReferenceMessageId, ReferenceTimestampMs)
-	}
-
-	return resp.Table, nil
-}
-
 func (c *Client) ExecuteTasks(tasks ...socket.Task) (*table.LSTable, error) {
 	tskm := c.NewTaskManager()
 	for _, task := range tasks {