removed wrong object removal: fixed last bug, ready to merge