remove depreacted function usage
all tests passing