Cleaner object removal, fixes #95