Fully remove sketchy code