Beef up the demo and remove testacular remains.