Remove PlayerDataContainer from code, general cleaning up