Compatibility with Linux 3.X kernel, cleanup