diff --git a/authentication/credentials/credentials.go b/authentication/credentials/credentials.go
index f7ad6ed..f06baa6 100644
--- a/authentication/credentials/credentials.go
+++ b/authentication/credentials/credentials.go
@@ -3,7 +3,6 @@ package credentials
 import "golang.org/x/crypto/bcrypt"
 
 // CreatePassword returns a hashed version of the given password.
-// TODO: Make strength configurable.
 func CreatePassword(pw string) []byte {
 	strength := 12
 	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(pw), strength)
diff --git a/dispatcher/dispatcher.go b/dispatcher/dispatcher.go
index fb126f8..baf324e 100644
--- a/dispatcher/dispatcher.go
+++ b/dispatcher/dispatcher.go
@@ -21,9 +21,6 @@ type Dispatcher struct {
 }
 
 // Create instanciates a dispatcher connection.
-// TODO: Call JoinedRooms() to validate room mappings on startup.
-// TODO: ForgetRoom() for unused rooms.
-// TODO: InviteUser() if the user is no longer in the room.
 func Create(db Database, homeserver, username, password string) (*Dispatcher, error) {
 	log.Println("Setting up dispatcher.")