Remove some safe guard lines of codes