Merge "Remove unused libraries"