fix Mini
metrics cleanup (mostly SystemLayer)