Remove unnecessary security function