cleanup and add in update call to player