Remove dependency on user module