seiib more cleanup