Modifications to remove teams