Revert "clean up raw lib"

This reverts commit cb0292049d1a3670581285f0569cb68c1583be5c.