Clean up based on TODO.