Compression includes, remove old code.