mk_casei + drop useless stuff
elementary bricks reorganisation