#84 Further object removal