Remove paranoia code