Code cleanup in media player service.