Small fixes for team play. Remove unused files.