Cleaned up teampkg