Remove some unneeded functions and inconsistencies between the two media player implementation
This will create a new commit in order to revert the existing changes.
