remove a bunch of depricated full conditional code