Cleanup and add clustering