Finished the private class cleanup (part 1)

This commit provides the private class cleanup
for all the missing classes for Facebook.