Merge "Remove two unused libraries"