Fix for remove team