De-listing

Not for merging yet.
This should also be quite clear.