Take out code that moved to lib