Merge "Remove six library"