Cleaning up

Clean up team creation