Clean up, #6