Remove redundant libs and use mutations module