seiib even more cleanup