removed all reference to player