removed all deprecation warnings