IMG-674 Clean up.