[Adventure] - clean up components