remove dirty hack from playbackservice