Got rid of all deprecation