De-listing

Not for merging yet.
This should be pretty clear with this comment.