Removing usage of login dependent modules in utilities