Minor comment and unused library removal