more attempted cleanup