BLAC-17: a bit of cleanup