Take out unnecessary admin check