Selections to reduce header parsing

More selection entries from Danilo Piparo (and one from me) to reduce header parsing and save memory.
Please merge this as soon as convenient.
This also removes some obsolete clutter.