Clean up staub analysis