De-listing

Not for merging yet.
I'll have to give this a thorough look tomorrow.