diff --git a/HEADS b/HEADS
index 461d3fc..e06c271 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"master": "0e95b8f945b02770de35dfc06bdddbaf246631d2"}}
\ No newline at end of file
+{"engine": {"master": "37d5c0fec8b6d0428daca36dff10b65e262408ef"}}
\ No newline at end of file
diff --git a/app/ccms_user_controller.cpp b/app/ccms_user_controller.cpp
index cac80fa..53ae130 100644
--- a/app/ccms_user_controller.cpp
+++ b/app/ccms_user_controller.cpp
@@ -6,7 +6,6 @@
 #include "core/http/http_session.h"
 #include "core/http/request.h"
 #include "core/http/session_manager.h"
-#include "modules/users/user_model.h"
 
 void CCMSUserController::render_login_request_default(Request *request, LoginRequestData *data) {
 	HTMLBuilder b;
diff --git a/main.cpp b/main.cpp
index d59cffc..e77f122 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,6 @@
 #include "backends/hash_hashlib/setup.h"
 
 #include "app/ccms_user_controller.h"
-#include "modules/rbac_users/rbac_user_model.h"
 #include "modules/users/user.h"
 
 #include "core/database/database_manager.h"
@@ -54,7 +53,6 @@ int main(int argc, char **argv, char **envp) {
 
 	// todo init these in the module automatically
 	UserController *user_controller = new CCMSUserController();
-	RBACUserModel *user_model = new RBACUserModel();
 	// user_manager->set_path("./users/");
 
 	DBSettings *settings = new DBSettings(true);
@@ -91,11 +89,11 @@ int main(int argc, char **argv, char **envp) {
 		settings->migrate();
 
 		session_manager->migrate();
-		user_model->migrate();
+		user_controller->migrate();
 
 		if (Platform::get_singleton()->arg_parser.has_arg("-u")) {
 			printf("Creating test users.\n");
-			user_model->create_test_users();
+			user_controller->create_test_users();
 		}
 
 		app->migrate();
@@ -106,7 +104,6 @@ int main(int argc, char **argv, char **envp) {
 	delete file_cache;
 	delete settings;
 	delete user_controller;
-	delete user_model;
 	delete session_manager;
 
 	PlatformInitializer::free_all();