Remove logic from teamView