Remove special rewrites for cmu and add library in config