Added team association feature
cleanup