remove safe logics