cleanup; remove <aok> from the bricks, they should handle their own failure; merge simplebrick and similarity brick