339 Clean up