[TripleO] Core team cleanup