Added back PollEvent
Added remove media functionality