[CHORE] Cleanup