Moved MVP calculation to team entity

Removed redundant code