Merge "Remove all usage of six library"