Removed dependency on ohMediaServer