Adds index for controllers, cleans up team traces