Clean up publicly visible classes