946 Clean up