todos and clean-up