Removing an unnecessary step from admin service