General clean up of depricated code.