Remove unused special deferred code