Moved a few things to maint controller