Clean up "#1 clean up"