deleting objects

Do not merge, yet!

see #636, #603