Clean-up and TODOs.