347 Clean up