Improved cleanup_players_props