More marker and playermarker cleanup