eliminated all TODOs not related to player object