#34 Clean up