Removed unused methods & fixed teams