Remove an unnecessary lib and refactor