remove ADX restriction
fix statics