Put note-deleted calls back, non-qobject objects do notify about their deletion.
Remove more unused functions and variables.