Revert "MediaObjectCreator class"

Prepare for upcoming release

This reverts commit a6a48887fc0c0c60bdc779110cb850b381ebcbb8.

Change-Id: I47f8dffe060ee1107697189e4ffb3240b548c2e0