[2.2] Clean up publicly visible classes