Queued items removal bugfix - proper

See last commit.