Cleanup MapScreenToGroup

Remove redundant function and cleanup some parts