[CHORE] Cleaning up