remove the rest of depricated code