[masakari] Blueprints cleanup