ninja fix
cleanup and fixed player unsubscribe event