De-listing

Not for merging yet.
Done.