remove needless include
Add DRM2 using factoredinteger
Remove needless lines