Got rid of the deprecated